Merge branch 'upstream'
authorJulien Cristau <julien.cristau@ens-lyon.org>
Wed, 4 Jan 2006 15:01:17 +0000 (15:01 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Wed, 4 Jan 2006 15:01:17 +0000 (15:01 +0000)
commitd65c55517fda3afbc96948eaf487545c972efcc4
tree4c86734d63163dbf03dfd1fce13128c6df3b22b2
parentb60a089760c7db0f05b86c71799676f1650be871
parent7fbbd3df39c5d53510df5fdba8d310b270954777
Merge branch 'upstream'